Autogenerated HTML docs for v1.7.10-rc1
diff --git a/RelNotes/1.7.10.txt b/RelNotes/1.7.10.txt index 65df74b..540ce38 100644 --- a/RelNotes/1.7.10.txt +++ b/RelNotes/1.7.10.txt
@@ -26,8 +26,8 @@ Git v1.7.8 or newer. * The "--binary/-b" options to "git am" have been a no-op for quite a - while and was deprecated in mid 2008 (v1.6.0). When you give these - options to "git am", it will now fail with an error. + while and were deprecated in mid 2008 (v1.6.0). When you give these + options to "git am", it will now warn and ask you not to use them. Updates since v1.7.9 @@ -119,8 +119,8 @@ * Project search in "gitweb" shows the substring that matched in the project name and description highlighted. - * A new script "diffall" is added to contrib/; it drives an external - an external tool to perform a directory diff of two Git revisions + * A new script "diffall" is added to contrib/; it drives an + external tool to perform a directory diff of two Git revisions in one go, unlike "difftool" that compares one file at a time. Foreign Interface @@ -180,17 +180,25 @@ releases are contained in this release (see release notes to them for details). + * The "remaining" subcommand to "git rerere" was not documented. + (merge 3e7a1df ph/rerere-doc later to maint). + * "git tag -s" honored "gpg.program" configuration variable since 1.7.9, but "git tag -v" and "git verify-tag" didn't. (merge a2c2506 az/verify-tag-use-gpg-config later to maint). + * When "git config" diagnoses an error in a configuration file and + shows the line number for the offending line, it miscounted if the + error was at the end of line. + (merge 4b34059 ms/maint-config-error-at-eol-linecount later to maint). + * "gitweb" used to drop warnings in the log file when "heads" view is accessed in a repository whose HEAD does not point at a valid branch. --- exec >/var/tmp/1 -O=v1.7.10-rc0-40-g57cec0a +O=v1.7.10-rc0-50-gd973dc0 echo O=$(git describe) git log --first-parent --oneline ^maint $O.. echo
diff --git a/git-rerere.html b/git-rerere.html index 5ba3660..49684f0 100644 --- a/git-rerere.html +++ b/git-rerere.html
@@ -583,7 +583,7 @@ <h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="verseblock-content"><em>git rerere</em> [<em>clear</em>|<em>forget</em> <pathspec>|<em>diff</em>|<em>status</em>|<em>gc</em>]</div> +<div class="verseblock-content"><em>git rerere</em> [<em>clear</em>|<em>forget</em> <pathspec>|<em>diff</em>|<em>remaining</em>|<em>status</em>|<em>gc</em>]</div> <div class="verseblock-attribution"> </div></div> </div> @@ -618,7 +618,7 @@ </dt> <dd> <p> -This resets the metadata used by rerere if a merge resolution is to be +Reset the metadata used by rerere if a merge resolution is to be aborted. Calling <em>git am [--skip|--abort]</em> or <em>git rebase [--skip|--abort]</em> will automatically invoke this command. </p> @@ -628,7 +628,7 @@ </dt> <dd> <p> -This resets the conflict resolutions which rerere has recorded for the current +Reset the conflict resolutions which rerere has recorded for the current conflict in <pathspec>. </p> </dd> @@ -637,7 +637,7 @@ </dt> <dd> <p> -This displays diffs for the current state of the resolution. It is +Display diffs for the current state of the resolution. It is useful for tracking what has changed while the user is resolving conflicts. Additional arguments are passed directly to the system <em>diff</em> command installed in PATH. @@ -648,8 +648,17 @@ </dt> <dd> <p> -Like <em>diff</em>, but this only prints the filenames that will be tracked -for resolutions. +Print paths with conflicts whose merge resolution rerere will record. +</p> +</dd> +<dt class="hdlist1"> +<em>remaining</em> +</dt> +<dd> +<p> +Print paths with conflicts that have not been autoresolved by rerere. +This includes paths whose resolutions cannot be tracked by rerere, +such as conflicting submodules. </p> </dd> <dt class="hdlist1"> @@ -657,7 +666,7 @@ </dt> <dd> <p> -This prunes records of conflicted merges that +Prune records of conflicted merges that occurred a long time ago. By default, unresolved conflicts older than 15 days and resolved conflicts older than 60 days are pruned. These defaults are controlled via the @@ -800,7 +809,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2011-11-15 13:45:02 PDT +Last updated 2012-03-14 16:04:56 PDT </div> </div> </body>
diff --git a/git-rerere.txt b/git-rerere.txt index a6253ba..b43b7c8 100644 --- a/git-rerere.txt +++ b/git-rerere.txt
@@ -8,7 +8,7 @@ SYNOPSIS -------- [verse] -'git rerere' ['clear'|'forget' <pathspec>|'diff'|'status'|'gc'] +'git rerere' ['clear'|'forget' <pathspec>|'diff'|'remaining'|'status'|'gc'] DESCRIPTION ----------- @@ -37,30 +37,35 @@ 'clear':: -This resets the metadata used by rerere if a merge resolution is to be +Reset the metadata used by rerere if a merge resolution is to be aborted. Calling 'git am [--skip|--abort]' or 'git rebase [--skip|--abort]' will automatically invoke this command. 'forget' <pathspec>:: -This resets the conflict resolutions which rerere has recorded for the current +Reset the conflict resolutions which rerere has recorded for the current conflict in <pathspec>. 'diff':: -This displays diffs for the current state of the resolution. It is +Display diffs for the current state of the resolution. It is useful for tracking what has changed while the user is resolving conflicts. Additional arguments are passed directly to the system 'diff' command installed in PATH. 'status':: -Like 'diff', but this only prints the filenames that will be tracked -for resolutions. +Print paths with conflicts whose merge resolution rerere will record. + +'remaining':: + +Print paths with conflicts that have not been autoresolved by rerere. +This includes paths whose resolutions cannot be tracked by rerere, +such as conflicting submodules. 'gc':: -This prunes records of conflicted merges that +Prune records of conflicted merges that occurred a long time ago. By default, unresolved conflicts older than 15 days and resolved conflicts older than 60 days are pruned. These defaults are controlled via the
